merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 31 Jan 2011 02:11:30 +0000 (11:11 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 31 Jan 2011 02:11:30 +0000 (11:11 +0900)
commit66ab610b26f3a558c648c8cc15f8f240e2edf19d
tree6f1ef548b3a2ec08e0bf6b972d174178791b68b2
parent18387cb7fe82cb37b24d4c67ff5911c41c3ae128
parent6e0479da9f1de6a10b3a2142192f1607e99348c8
merge trunk